More -Wcast-error fixes
3 files changed