A few other version fixes