Updates to fix mmc environment