jh - GUI merge fixes