Fix Hugh's 12.1 and half of reviewer 1