Minor changes to the new build system.

I tried the new system, e.g. recreated my dev setup with the current develop. A few small things came up in the process. See review threads.