Trying to fix more byte-packing issues