Fix channel/mapping units and shapes
Please tag upon merging, this prepares for immediate release as it is fixing a bug in production
Edited by Kyle Sunden
Please tag upon merging, this prepares for immediate release as it is fixing a bug in production