Minor CLI enhancements