Fixed some more classes from the merge Update #4