More SMatrix fixes.