Various Fixes and Patches