Some Build tweaks