more fixes on EOO calcs