Squashme: Fix up