Fix logging issues
Fix logging issues