Small fixes

Change-Id: I7e8b47d6b0d29a5c5eb8d1329c597905a4d9bffe