[mr2683] Remove some compile warnings