Fix some pointer issues.