Possible fix for Power Pipe load issues

Closes #829
Closes #717