Fixed some classes being excluded from project