Fixed more pointer nonsense