Clear xcode "validate" warnings, fix class method call and import "CCPDo...