Misc build updates