Cleanup and build fix