more adjustments for upower-1.0