Fixed some problems after cppcheck