fixing bugs related to cluster router deployments