#1038 Logging updates