more fixes for power management