Fixes (mostly sweep related).