More subdivison fixes...
SS3 up-port.