Little fix (forbids pointer arithmetic in some places)