Couple minor changes to output of functions