Fixes on index.js