Fixed some power issues