Big fixes for Global extension