Improve integer handling