Add functions to check and fix cluster data