Fix cluster vars