A few updated lines in a few classes