Misc changes

Changed reference to CPBase