Fixes to parameters file handling