small cleanups for build system