Fixes after changing Config.groovy structure