Fixing verification errors (incomplete)