minor build cleanups