Minor bug fixes to generic model input files.