Build fixes

You know the drill by now - your weekly fix of fresh build system fixes ...