more fixes to spring configuration