Improved the initial globals parsing