Various Fixes
self support
self support