Minor fixes suggested by CppCheck. Nothing exciting.