More fixes related to controllers