Fixed references to global config