Some changes in virtual Dispose method.