Small enhancements and fixes