Fixed compilation problems after last refactoring of merging commons and natives modules into core