Disposal function improvements
