MOSYNCLIB-12: Experimental fixes to make it build