Minor Fixes

Minor Fixes