Small changes

to a couple of classes