Relieve some compile warnings

Change-Id: Ief4ac777f1133412611b7226d849c1c805cca328