Pretty print output fixes