Changed some more ints to longs