Two small improvements