various version fixes (see description)