Fix gray-streams and binary-data.