Fixes for last change

Change-Id: I8a8d0792ed45a4114aff0042bf9da6e5d16e01d7