More fixes for output