Cra 505 CRA-723: Initial fixes for running case 7 in multizone, still errors in output.