Fixed timeout issues