Minor updates to controllers