Power Manager fixes from savvas1