squash: fixes based on comments