hsmmc: Fix some stuff from prior commits