[SQUASH ME] more output fixes