Bug fixes in output.