Fixes for openSUSE/SLES

Fixes from testing on SLES, double checked on openSUSE.

Closes-Bug: #1241188

Change-Id: I2cf30fbb634f57a82a11f2a53f7e7ad57d156fe9