Release fixes

This is the controller ordering work and a few other minor bugs.