LM changes that did not make it into code.