cluster fixes