Various small fixes forwarded from openSUSE