Fixed compile problems
Merge branch 'master' into EmptyGroups