Few Minor Fixes