Label fixes and CPT updates