Some fixes for labs related issues

Change-Id: I29aa377b1f9cf61b435d77d827de216a88afae69