v3 fixes (with version number update)