Bugs fix on 41 - 0.0.42

Change-Id: Ieab84d49a1cd411cd40fa0a4acc0ee2b215a648a