Fix some servlet HTTP upgrade issues