Fixed bugs related to Spring start up.