Obj Files fixes in oneshot