Some more project build cleanups