Updated to newer backports to support newer Ruby versions