Fix instance variables in controller