Some fixes for checkout
Versioning