Small fixes

Change-Id: I8926289935590945a23dfa8b4cc452a1ee3f6163