Dispose: some changes