Changed class definitions in two missing positions