Fixed some more references of deprecated classes.