Small changes to some controllers