Bug Fixes

  1. Fixed third party macro compatibility issues.