cluster bug fixes