More updates to make more resilient to upstream changes