CPT updates for Debian and Cygwin: PR 2