Bug fixes in Logger