Bugs in 21.0-pre9