Various Fixes for support