Speedup verify

Just 2 small tweaks to speed up verify a little.