Try some rails edge (4.1) fixes