And some more pointer arithmetic fixes