Fixes to support globals