Fixed more LongVariable warnings