more pointer handling corrections