Fixes from OpenSuse build, thanks to Edgar