Misc build niceties