Bug Fixes

  1. Fixed term loading in graph mode
  2. Fixed third party macro compatibility issues