Diagnostics logging

A few minor changes are testing this afternoon.