Fix Int() and Integer()