Correct some bad parameter subsitutions