More attempts to fix versioning