Rails 3.2 compatibility changes - work in progress