sort out yet more type issues
6 files changed