Minor fixes

Change-Id: I5a3a2dd591c97f92b8e0db9da7646f0e75c6caaf