Minor changes in autowiring