More Rails4 changes