[pl] more false alarm fixes