These patches LGTM!