Fixes for Rails 4.0.0.rc1