Made some logging changes