some tweaks thanks slim

Change-Id: If73e104d79e7415e7e320247f2763bce2ea304b2