Changes to reflect BlackBox compiler update