Couple changes to output