FIX: Tidy up some logging messages