minor dispose fixes