fixes to support variables