DEBUG disabled, cc and header fixes