Add two patches by David Voit (thanks!)