More updates post-merge