Minor tweaks to catch partial reads and split packets