VID-977 Fixes from pull request