Fixed some logging deficiency