WIP Fixes to get atc working again

This Pull Request contains a few fixes that have been cherry-picked from Connexions/atc#github . This PR will probably be tested by interns in a day or so.