Rails 4 Fixes