Labs: minor fixes to toollabs module

I wish the puppet compiler worked for labs.

Change-Id: Idc9a06bc1d9c1d9974a8029a53eed2fbd2008e3e