Cleanups

Three small improvements.