C-SM small fixes and adjustments