Fixes and change versioning