More rails 3 compatibility changes.