Changes from x0l to fix Mac builds (#67)