Minor data parsing changes