Continue working through issues found with cppcheck