misc
lifetime fixes
Fixes