Modified patch-files due to pwd errs.