Fixes to US3143

https://github.com/openshift/li/pull/931