[pl] false alarm fixes, and one TODO