Adjusted some logging functionality