Experimental tweaks to address stuck server start issue