Fixes for changes in udev-library