More updates to fix a suspected bad merge