Added missing changes to fix int conversion errors.