BHV-11799: Incremental fixes

Fixing issues found during review / integration.

Enyo-DCO-1.1-Signed-Off-By: Gray Norton (gray.norton@lge.com)