Fixes to verifications

Note this is NOT the crash I mentioned to you on skype. I came across this while trying to repro the aforemented issue.