Less debugging, still long timeout