Bunch of old fixes. I think they're all related to the control panel.