incoming data format fixes