Last fixes in Rise.js