Adding global support, other fixes