Fixes for Mloc, part 2.