add patch tooling and partial fix for k8s reported in #77