Fixes in global variables