SC fixes from Vitalie