Fixes in versioning