Minor bug fixes
[#60333304]: Added controller initializations