fix compile warnings
Merge branch 'fixwarnings' into develop