Minor fixes & enhancements