Random cleanups pointed out by @lmacken.
Be more careful with that default socket timeout.