updates for rails 3.2.12 compatibility