Fix issues in power service