Make some fixes to output.