Fix a set of issues with K8s deployment