Fixes two clustering issues causing temporary or permanent absence of master