veritoken related fixes