Minor Fixes.