More updates for rust master