Various fixes & enhancements