Fixes to verify script