Comments from LNT and other fixes.