Misc build cleanup