Some fixes to new-examination