Some compotability fixes for Power manager