19/20 fixes