+Minor Fixes