fixes

Change-Id: I6876e0b42269ad663d64868d516fcbb0a14106fa