SQUASH: few misc things that need to be squashed