Just a couple of small improvements