Final part of Dispose corrections