SQUASH: small diff improvements 1