TS-1609 Fix build issues with gcc-4.7 related to the Cop changes