some fixes (squash)