Move to Rails 4.0.8 more fixes