Various minor enhancements