entity save/pup focal fixes