minor changes to help patch