macro fixes