Fixed some bugs in setup.js