Changed more files to be better in sync with rails 4.2.0.beta4