Fixed disposing issues.