fixes for disposables and stuff