[pl] fixing false alarms and disambiguation