Minor enhancements here and there