Various logging bug fixes and revert socket timeout