Fix other instance variables