Minor changes for optional powerline use.