post-rebase fixes (SQUASH)