Changes to allow open-logic to compile out of box