Fix a few niggles found by cppcheck

cppcheck  -I /usr/include src/