more rails 4 fixes