fixes to variable classes