Minor build system cleanups
More build system tweaks