fixes for cppcheck (benign, mostly style issues)