Minor code and documentation changes