Timeout fixes, error handling