Fixed some more variables in cpp files