Squash: fixing quality issues