Fixes to Global references