Misc build fixes