Just a fix to another set of bugs caused by auto-disposal.