K8 fixes
