Still more versioning fixes