Just some house cleaning to the configuration handler