Fixes for reading zero-suppressed data. These should be propagated to