Minor bugfixes because of the change to the CommonController