Various Fixes...