FIXED: Code Quality - Issues reported by Cppcheck.