Additional rails 3 updates