Trip output format fixes