Fixes in data.js