Fix RUN_IN_PLACE=0 (partly)