Move compatibility classes out of API building
Arrows fixed
Build