Adjusted spawn files to recent change II.