rails 4 related fixes
new rails 4 happy version