Verity issues (2e64d31, bc87b01)