Change conversions from object to int to object to Integer