Address bug 2187 and also minor xml changes.