Minor fixes and enhancements