[BUG] Demurrage bug fixes.