fix a couple of warnings

Merged Christian Hitz requested to merge chhitz/dss-mainline:fix-warnings into master Jun 21, 2018