2 Minor Fixes