fixes for globalVariables and data