Fixed some GlobalVariableManager issues