-Various Fixes