Fixed two bugs related to EPIC PID handling