Attempt to get working with latest rubies and rails