Fixed calls to new classes.