fixes by SC