Better fix for -Wcast-align errors
5 files changed