fixes for lastest commit

Change-Id: I9ce53f6eac72b709b5eb6b1a36a593ca39467d8f