Minor changes. Address bug 2121 and 2172. Fix problem in 111.xml.