Misc build tweaks