rails 4 hacks, fixes
rails 4 hacks added