A few more changes to the output.