Fixing a few compile errors
Merge branch '2.0' into 2.1