Tool Labs: more eqiad fixes

Change-Id: I640b44ff3b8e51fd1da629a6f2ce045421d70d4c