Updated matchcompiler to latest changes