More logging and robustness improvements