Various Fixes / Changes