fix warnings
Merge branch 'master' into logan