EES-12687, more changes to get stuff to work.