Make minor changes to input/output of rhs files