Small doc enhancements