"Minor fixes and enhancements"