Few Minor Fixes and Changes