First round of mjallday fixes.