More fixes - output format