some more long/int issues