Minor modifications before modifying settings file processing