More fixes
Version updates