Squashed fixes for legacy opensuse systems

squashed #437