Added MAUI and fixed MATE.