Further improvement in UACHandling.