Fix several files for supporting CaC content 0.1.59.
Activity