Update patches to address Karl's review