Minor Fixes

Minor Fixes...