Updated to merged PPC port.