Some macro fixes.