sm. fixes