Minor fixes to data parsing