Fixes to binary transport