Add wip fix mex upgrader, Closes #492