VID-1787 Address issues raised by @jsutterfield