Improved cluster startup wait conditions