Various minor fixes. Stop lying about default timeout.