Review fixes. + Spring xml.