Improve byte-safety
5 files changed