Fixes for last commit

Change-Id: I088352d5d11655a613a16e7f69c5127b1f9a917c