Felix based build now appears correct.