Fix instance variables