Added mdtool build fallbacks