Various fixes for OpenSUSE