fixes to 22-3 and 22-4