More updates for 4.14.