Clean up, fix build