Added missing 'Dispose' methods