Epic pid fixes