Fixed int to varchar where needed