Fix controllers
Fix session controller