Fix version handling