Add missing classes to compile
Merge branch '2.1'