fixes to global