More output fixes