Minor bug fixes & enhancements