Minor additional fixes in the inifile PR