Small changes in some classes