Fix another case for instance variable
Fix incorrect highlighting of class