Some initial fixes for SS 2.4 to 3 conversion.