Fix pointer issues
Fix visibility issues