updates to fix control-plane