Some little fixes & enhancements