Fixups for mmc1, minor refactor