Warning fixes with specific uses of bundle controllers