Misc Minor Improvements