0.21 compatibility changes