Minor tweakings for Powerline