ORBit2: fix build & simplify