Cleanup & fix build