Fix broken build and use new object input method