Various Fixes.