Some changes for coffeescript