Fixed logging in a few classes