Pointer handling corrections