Various Minor Fixes