Some more minor build cleanups