More ptr errors fixed