Minor Fixes

Fixed