Yet more build tweaks