fixing SS 3.1 deprecated issues