Small Fixes and Enhancements