Play nicely with new ruby versions