various needed casts
2 files changed