More Rails 4 compatibility issues addressed here