Fixed some 'Class not found' errors