Fixed UnitDisplay to use longs