Macro hygiene fixes