Improve UPower1 support