Timeout and stuff fixes