Fix issues with version