Various fixes around
Controller vars