Version 0.16.5.1

Small changes after using cppcheck