Trying to fix header pointers