Couple of fixes to keep master and slave nodes in the cluster running.