Fix non-master nodes