Binary encoding fixes.