Minor fix & enhancements