Fix errors for rails 4.1