some fixes to get verification working