Ptr checkpoint fixes