Apply patches that came from Bill Parker <wp02855@gmail.com>