My patches for ddollar/foreman