Update patches for Ven's changes