Tweaks to accomodate websocket framing