Tool Labs: Fixes for eqiad support

Change-Id: Ia9759f352c402babe8e42023daa5e138a09aa14f