Fixes for EA4

Mostly minor fixes. Also took the chance to switch configuration of additional cluster members to use the method recommended by Colleen Whitney on the ML forums. Hope this will reduce the chances of us finding ML has stopped responding on 8001.