Fix handling of config sub dictionaries