Minor changes in output handling.