Update some plumbing

[ci skip]
Fix compatibility with rails 3.x