#1 Minor enhancements