Fix missing classes