Make minor doc and code fixes