Deal with timeout gc issues