More little fixes on solution.js P2