Fix some places where octet to byte conversions are needed.