Fixed selfchecks according to new Emender functionality.