Fixes on data parsing