Tweaks for slightly improving the handling of the last byte (still not