Additional updates for #742