Tweaks and Fixes

Minor fixes