Fixed bugs and fine-tuned support of disposition logging.