fix cluster build errors