Added some final global variable tweaks - no more namespace leaking!