Merge pull request #245 from leftmostcat/master

Fix build in master
Better replacements for missing mx API