Fix Rails 4.1.0 issues correctly. Credit to @carsomyr