Fixes timeout and connection