Various Fixes (I'm PM I do what I want)