Make minor improvements
v3.1.1