Make changes to run on rails 4.0.4