Fix the pointer madness