Add more places where explicit byteorder is required