Fixing #35 and rest bytes byte incompatibilities