Fixing tag version
Fixing cluster issues.