Fix define macro
More macro fixing