Base: Cleanup and fix build status