A few small quality enhancements