Fix timeout + minor fixes.