Make minor improvements