Fixes for opensuse