Updates for cphp and to the installer.