SQUASH: small diff improvements 2