changes for rails 3.1