Support ha on Starter.java and a few small tweaks