Update handling of 'verification' nonsense