Fix parameter filling from INFILE, make strict