Fixes to the SM mess