Fixes the versioning issue in live tests as well as other stability issues