More spurious fixes due to undocumented behaviour changes :-@