More powerline fixes