Multiple minor build system cleanups