Fixes to global