Changed more stuff to use Bytes