Tagged logging - bug fixes