v1.21 fixes