Minor fixes to P26 and others.