logging fixes
logging fixes