Take out some more misplaced FatalErrors, reduce reliable on eval state