more rails 4.0 fixes