fix type generation for int and uint