Various Fixes

I can't really describe these changes.