Revert "Minor cp fixes"

This reverts commit a978e5def3c9e5c93c04bbc6718e420668ee9d57.