Fix minor bugs in verification