Minor Fixes And Tweaks