Some compotability fixes for Power manager #2