Harmonize macro alignment