tweaks to rails 4 upgrade