Minor fix and structural improvements for SPDY/4