Some more tries to fix timeout stuff