rails 4.1 fixes