fixes to support varchar(int)