Additional minor enhancements