CoffeeScript bug fixes