Horizon plugin fixes
9 files changed