Update a couple more classes
4 files changed