Timeout handling: -1 now means default timeout, use that everywhere