Some fixes for version-system