pid and timeout fix