Unbreak several merge derps in native and update