Minor build cleanups