Macro related bugfixes.