Fix for when the new config variables are not defined