Small fixes to improve project integration.