Multiple bug fixes

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