Fixed logging in some classes.