Fixes for networkportlet 3546