Corrected some TextVar issues