further rails 3/ruby2 changes