Pass opened files as patches; updated utils