Further changes to make it SS 2.4 compatible