fixes to vars