warning and some codestyle fixes

latest commit bf33881d2f
@dakk authored