fix some coding mistakes

Change-Id: I29a2e43cb2344021cd2f85834650c3d60993a0de