Squashed fixes for legacy opensuse systems