A couple of minor improvements