Yet some uia v3 fixes

See comments for commits