Minor improvements.

Authored by asemke on Feb 16 2020, 9:46 AM.