VID-1249 Fixes from pull request comments