sm: fix rebuild errors