squash code fixes