Fixing errors from empty macros