Better cluster master handling