Misc Fixes and Tweaks