Fix the sketchy POI system.