Minor fix and further preparation for SPDY/4