Fix issues from #426

Wondering if LoggingAdapter wouldn't be better as an interface with extension methods rather than an abstract class?