Fixes and Tweaks