Various changes to default EOG criteria