SmartAssV2 tweaks

Change-Id: I4253c821ed9c89c1ccac77286c6cb277dd8f06c1