A few minor improvements