Fixing bytes contd.

Found a few more issues, but with these fixes I am finally seeing no issues under full load testing.