Fixed some more usages of deprecated classes.