Some minor fixes to Chimera setup, and some cleanup