SQUASHME: fixes