Fixes for CoffeeScript style issues