SM tease fixes (wrong calls) and additions.