More Int fixes