Fixing incoming data parsing issues