Various Minor Tweaks