fix compile warnings/errors

Change-Id: Ic8aaa0728a43936cd4c6e1ed590e01ba8f0fbf5b