Two MRs on git.lysator.liu.se