More Rails4 adjustments