Various Minor Improvements