More Minor Fixes