Ran cppcheck, reporting minor issues. Suspect not being fully checked due to include error at bottom.