Fixed function calls to only globals.