Small output fixes