Fixups for rails 4.1