Have fixed some logging