Fixed some of the class locations overriding the wrong things