SQUASHME: more compatibility changes