Fixed cpp files