More little fixes on setup.js