Various fixes and improvements

Some fixes regarding MM support, also reintroducing / finishing up some
changes from the reverted WIP commit