More macro fixes