Fix wrong component/object references