More logging in case of issues