Update to work with latest ruby versions