Small IDisposable improvements