Fix 22 to 21 and other notebooks