[Logging] Yet more logging stuff