Fixing data parse errors