A couple of small improvements