Fixed some issues in Logger