FIxed issues with supporting activesupport < 3.0