Better timeout handling, and nick coping