Tool Labs: Tweaks to portgranter

Change-Id: Ibb8e5f176debe85f5c7bd81de7e27e304e16ee9a