Fixes to ConfigurationHandler