Minor changes for the SS3 conversion.