Upgrade to rails 3.2 and small tweaks