fixes + CC