SQUASH ME: more fixups