[pl] false alarm fixes and one FIXME