Timeout problems fix and improved logging