Various Tweaks and Fixes