Add a couple of minor improvements